Reworking the interval stuff.