Added a bunch of spike stuff