This is npme plus some copy changes and the checked-in-modules