Save and Restore of session now works - for the most part