Modified various classes to utilize hex grids