Draft - Summary of Nick's Work 04/03

Comparing nick2 to master to allow one comparison of before and after rather than looking through individual commits.