first pass and correcting some pre-reqs to new system
5 files changed