More work towards first release. Improved example.