Restored previous functionality before refactor
Restored previous functionality before refactor

- Also fixed the modifier weirdness - at no point had I initialised
  CurrentMod to 0

oholiab/vrhackspace,oholiab/vrhackspace,oholiab/vrhackspace