Added some generators to make passing numbers around easier and much more flexible