FIrst commit message wow...
Fixing superclass issue that fixed itself and fixing control class