added several todo notes in the code