v2: wip reoganising to new mockup.