Improved the TODO, because I did stuff!