Revamped all the pad collisions

All that's left is adding bias
Merged
More merge