Working on mockup implementation