Added subclass and finished drawings, should be complete