fixed some things in the refractor of saving. prompt before logging out now happens. Still have a few TODO items for the logout phase.