Merge pull request #5 from MrDOS/master

Bring data definitions up to speed and add persistence interfaces.
getting ready to post session