Move initial spike to actual library