OOP Redesign

Redesign the script in OOP to get the functional code out of the display
code.
Clean up the code a bit