Moved TODOS to a shared document