created new class display and fixed TODO's