Deleted redundancies and added the emtpy classes to be implemented