Made these files use curly bracket uniform initialization
Refactory
made some constructors private, added some convenience typedefs
ho hum
revised todo
Factored some stuff into utility
keep going back and forth on this