Fixed walking some more, tree structure added