Attempt to implement objects system - stuff should be a little easier to do now