adding comments and TODOs