Ooops - fuked up previous commit; this commit now includes the gui files....