Pass 1 of 4 for reviewing / prepping for merge

Getting shit in line ready for the big move!