Move TODO to its own file, close #4