Moved a bunch of key properties to Core

Probably the nastiest part of the entire refactor.  *Seems* to all be
working now, but this was a great deal of delicate work.