NOT FINISHED-STILL WORKING ON CLASS RENAMING