fleshed out mockup more