Major reworking of classes. GUI updated with much more features