Now properly supports interval's