Second Round of Modification.  Everything is working properly.  Needs
names and cleaned up UI