Added back files that were removed from master. Will start to cherry pick instead of merging going forward.