major refactor for manual data collection
Merge pull request #2 from dhuseby/refactor

major refactor for manual data collection