More work on the mockup