Adding user controls to GUI, fixing some OO problems.