Initial re-write to use a single moment