Copied from TODO list to keep track of comments and commits here
Copied from TODO list to keep track of comments and commits here