1.6 - Logic Working / GUI back to basic