Added new classes and control GUI