[Enhancement] Adding moment computed fixes #6

This PR is dependent on #9.  Will squash once you thumbs up and merge #9 .
Ah, ok.