add comments and todo