Added some TODO: comments so I don't forget some things.