started to add grid stuff to data class