Feature/vov 1970

Everything that was needed was already in the code base so I've stripped away everything else. There were two days down the drain but at least I can debug MasterFile problems now.