Submission/rhauck

Replacing the previous pull request with this one, which includes the addition of the shepherd api in lieu of pulling test #'s from spec annotations.