Checkpoint checkin
Consolidation of subclasses for speed.  Work in progress.