TODOS comments added