Move more code to the core

Yay for coreward work.