Last bits of Kellie's amends
Merge pull request #40 from ministryofjustice/dev-clive

Last bits of Kellie's amends