incremental changes, now ready for dirwalker