Some object changes
A quick code dump. Does not compile, don't even try.