There.  Main class refactor complete.