Push before Reorganization.
Reorganized everything. Made it more object-oriented. Tests no longer work.