Some more work on CompUnit, not yet functional