updated directory logic in prep for -R impl., spent 2 hours on ++j...