Almost done

Needs a check if saved before exit.