Some work in getting the dimension to behave. Now to bed...