Adjusted structure to adopt traversing, fixed some possible future bugs.
Merge branch 'master' of https://github.com/kabbi/wonderland