Hopefully we'll remember to grep for TODOs before we merge this back to master :)