Split some stuff out