WIP

The ij2 and ij2-ctr branches have diverged. We must remedy this before
merging to master!