Added Minor TODO list