Setting up repo
merged with upstream