Remove TODO, for now
Add a display object
Move drawing logic into Display
Don't explicitly pass width/height into Display