Fixed Moose inheritence

Main code rev. 1947