path objects
Merge branch 'master' into pathobjects
working
seperated out pathqueries