Clean up
Starting with the main UI objects
Added base INT object
Adding inheritance