Revert "Revert "Final Commit 12/15""

This reverts commit b76ea2043885d818f7eaf02a308f33c09b5c6078.