refactoring progress
Merge pull request #2 from jvanderz22/dinodex_refactor

refactoring progress