- Moved stage to a model so that stages don't have to be consecutive over consecutive years.
- Minor changes here and htere to do with permissions etc.