Blair's info under the right group. Closes #102
Merged changes