Much progress on new gui