Worked on the general layout and design. Nightly commit 1/6/13