Score Agile Hybrid: Pull Request 2

Now with more granular commits!