Finished adding, but not testing, number support.