Feature/implementing grid