Add comments and TODOS
update