First 'finished' version.
Docs updates