Adding core and contrib modules works.  Still working on chaining them together.
Fix merge