Added a bunch of "todo" comments