Reorder methods
Add 'TODO'
Merge pull request #2 from snowiow/Outsource-Logic

Outsource logic