Moved grid into model