Adding comments and @todos
Merge remote-tracking branch 'origin/master'