breaking out tree into separate files/functions
fixed merge
Merge branch 'master' of https://github.com/shawnbro/quick_shark