simplified, removed display class, unit tests added