Add getters and setter for relevant variables and alters GUI handling to remove waitingOnGUI variable