Refactor 32, Finish 38-39