Barrowman's shit added and fixed up a little bit. Still very buggy.
Merge branch 'Cameron' of https://github.com/tchordia/teamdhc2 into Cameron