Updated to include TODO list