Splits up the core a bit. More to go.