Added a little shoe polish and attempted to resolve formatting.
Updating project for more.
Resolveh merge conflicts.
Merge branch 'dawson'