added basic path building functions
merge changes'