long time since last commit. need to check out other branch.
prep for merge with ian's newest push with overlap fix