WIP - more work on doc