Adding comments and todos