Finish most of the new number implementation