Continued refactoring. Corrected a bug in the determineDate method, changed classes to follow the Singular pattern, and started fixing classes so they will compile again.