[Refactor]  Break up monolithic shell creation function.