Removed Commenting
Added new classes to support GUI