working layout
Merge pull request #1 from GeoffCrittenden/working_branch

working layout