wip
fixed directory tracking