A bit more work on initial version.