Merge attempt with base

Merging with new commits from KC