Work in progress. Sufficient to continue the testing section.