Reverted to before display.js was implemented. Needs more work