Moves more functionality into the core.