Pull Request: Initial work

@brettweavnet / @thbishop once this is approved, i will tag it and add it the the berks for lc and ssp and then do a pull for those repos.

Testing was successful against this branch.