Pull apart functions in 1.45
Finish 1.45