Revert "Revert "Spike38 Complete""

This reverts commit 4b677ca91e164e0dafd9f45bf80a9386caa36528.