Work in progress. Should have written tests first. Blasted eagerness..
temporary testing
Fixed documentation.