Got saving of settings to work!!!

Also did a bunch of other work like added in popup windows, etc