imported changes from source made before the folder rejig...perhaps i should not do this when sleepy!