Work in progress, except I’ve pretty much stopped working on this