Todos are broken, but wanted to commit the code