Spike

Merging spike into dev, going to use Nancy going forward!