Everything is an object now, more refactoring