Revert "Revert "June/July Code Combination""

This reverts commit a4eb28494190325001f50c48a8ec211b442cf4b0.