Broke some code into a second class. Need to split more code as GUI code
getting too big and hard to read