Work on saving and restoring session.  Not completed