Re-worked classes and GUI, works now =)

Re-worked classes and GUI, works now =)