Finishing up the spike branch
Finished the branch work