Continuing to work on this. Still very much WIP.