Added a couple todo notes