Merge Conroy Branch

Hurrah!