Added some todo notes, mostly related to testing