Adding files that overlap with KC project. Mostly working