Add some todo notes as to remember what the intent of the subsections are