Added number choice, and a bunch of other stuff