Finished initial class improvements.

Compiles with QGenRecon.  Not tested.