Even More Gui Work, and program rewriting