Spike endpoints

Recreating #113
Will do once this gets merged in master.