Iteration one

First Pull back into Master. We worked hard on this. Give yourselves a pat on the back.