Add spikes and safety mechanism
Merge branch 'safety_mech' into develop