Integrating the two grid systems more thoroughly into Basis