First commit

- Attempting to get all the relevant changes from the original MCP-6
branch.
More updated files
Merge branch 'master_fresh' of https://github.com/kevinbrink/CP3_Enhancement into master_fresh