Refactored so all my existing Feature/Objects are working with Marco's merge