Update to work in progress

If there's a TODO then I know it smells...