major test update, late commit.
Merge pull request #25 from daveology/layout1

major test update, late commit.