Game seems fully functional after refactoring.  Even added some minor features to boot