Incremental Update

I tried to readd as many of the simpler things as I could find using
2.0 instead of 1.2 classes and such.