Adding joint physics, but the physics immediately freaks out
Merging joint stuff.
Fixing merge conflicts.
Joint physics partially in place, needs more tweaking going forward.