Added todo notes for future reference