Merging with old tigerSCR project and new files from Vegore