fixed and broke stuff- grid is almost working