Cleaned up some unnecessary classes, streamlined some things, added some TODO comments for the future