Spike endpoints

Recreating #113
right