More work on the mockups