Finished up single-child
Finished breaking out SingleChild constructor