Vurich Bunch of stuff, cba to write a good message

Latest commit ede84a5

Sep 18, 2018