LB-21

Had to delete the branch and re-push, there was a conflict that kept requiring me to pull (but it was up to date) but wouldn't allow me to push --force on a protected branch.

work in progress, will have everything I have pushed shortly, have to overlay my changes back to this branch due to the small issue I had described above