Switch to Moo (incomplete)
FIXUP
FIXUP - tests pass
Updated Changes [ci skip]
Merge branch 'rrwo/devel-moo'