Various works-in-progress.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
Point this branch to my github repo for release purposes.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>