Further client mockup work