Feature/mockup grid implementation