Fixed infinite loop problem and deleted some classes. Need to fix behavior at end of run and when starting a new game