Remove singularity and add a semantic grid.

@andrewtennison