Andrew units work

Definitely needs careful review and some patching, is a hasty where-I'm-up-to.