Adding comments and todo's