Condensed and cleaned code significantly.  Added restart feature. Tested for bugs

Combined similar classes
Finished commenting.  Small fixes