Adding comments and TODO