Moved the commit earlier with more comments and a TODO. It's really
weird. Really weird.