Refactored stuff out to a less generic grid-class