Restructuring to allow user settings & future GUI