Merging Branch "Quintini" into Branch "Master".

Merging work on SRS and SPMP for the week, round 1.

First up, SRS stuff; specifically, the SRS's use cases.