Revert "Revert "Dalton Tapply, Peter Leondires, Jacob McSweeney""

This reverts commit b271ebdaa3fcda339561b3a1b7a4b1e836dcc1d6.