lots of changes

This is a big push intended to stage data for an actual move soon.