Actually finished output and display

This time without deleting everything in the repo!