Tons of bugfixing -- also, early, untested OOP