Shanahanitization

Committing the Shanahan changes