Quit button now does its job
More planning