Added comments and a todo item