More todos + mockup