working on the mockups