Work done on proximity trap
stuff
Spike drawing
fixed merger errors