Splitting this out from #2
Splitting this out from #2