prep for merge to new methodology
5 files changed