Revert "Revert "Merge branch 'master_fresh' of https://github.com/kevinbrink/CP3_Enhancement into master_fresh""

This reverts commit 8451511f79ea1b06c6d662c5d057ee70bc2a2a33.