Moving more maths to core