Appears to be working very well

this appears to be ready to merge. Collisions are happening.