6th commit; project complete; tweaked a few classes