pathdef
merge?
please pull
stufF