More TODO inspired by Dan Weinlader.