My final commit today on the mockup