* Switched some code from Main Class to Control class