more OO dev.  almost done