Refactored, added MainNew for 'migrating' objects