Move more things out to the core_script