Removed unnecessary classes and added some TODO's