major update, late commit.

Hopefully this works.
Merge pull request #13 from daveology/layout1

major update, late commit.