Spike nearly done, added name constants