Started transitioning to Adam's mockup