[ADD] Cleaned up and updated TODO list