Revert "Revert "Spike37 Complete""

This reverts commit 4c06396aeb9eecde974c58d8576c5f449e314a89.