Probably should have done this on my branch but nothing should cause conflicts
Merge branch 'sprint5' of https://github.com/puruckertom/ubertool_src into sprint5