Started working on a new GUI class hierarchy