First pass mock up
Merge branch 'mockup'