Last main commit

This is where randy does all the work!