More work on mockup