Added some TODO notes for later.