Added todos to the boilerplate