Commiting for final push from this computer

Still rewriting base classes to use Moose