Finished changes, implemented display methods