Complete

The code works, but needs a lot of refactoring and conversion to the
MVC paradigm.  This is only temporary