Update V2.0

The big Object Orientation Update. I'm already liking this a lot more.