Rehaul started, working on better object-handling