more dir stuff
merge commit