object update

Flushed out object model a bit more, still needs lots of work