Convert required bundle fields into base fields

Creating a PR for this change, just to track it. But there's still some work to do.