commented out a few classes until they're ready to commit changes