added todos
removed todos