Refactored, added two stuff objects in main