Yeah, my inline TODO's aren't the most explicit ever. :/