Mockup is working as intended, needs more test