latest updates
Refactored SmashUp constructor into various init methods.