Overhaul objects and move to a working state