Added parent to graph walker
Re-enabled sorting
Merged