Spike check implementation

Once you update this I'll merge.