wip
wip
Merge pull request #2 from Kidarmstrong/filling-in-layout

Filling in layout