Got the general layout working.
Merge branch 'master' of github.com:greysonp/lehigh-laff-2013