Refactor objects

I hope I haven't broken anything. Anyone wish to confirm this?
See above, could make this part of object_load