A bunch of previously working bits are now operating in a object orientated fashion.
Looking better.