Started adding display, finished rewrite