S-47665 Pull out calls to moment so move into a new module