Adding TODO and reordering declarations
Merge remote-tracking branch 'origin/master'