Initial work.
Progressive progress.
Adds test.