Latest changes so that Shaun may merge his formatting corrections
Code does not compile
Latest changes ready to merg. Compliles, but not yet complete
pulling in changes from origin/master (incremental merge)
pulling in changes from origin/master HEAD (incremental merge)
Corrected formatting
Fixed merge conflicts