Final commit of main material. Waiting on some asides from Erik and Gabe.