just moving stuff out of the UI into core.