Moving toward non-recursive tree
Merge branch 'dev' of github.com:tarwich/jackal into dev