Deleted uneccesary classes, added new draw method.