New way around symlinks (hopefully)