Some work in the repo to prepare the way for exmaples and tests.