Merge physics for monsters...

Hopefully everything is merged correctly, this was a pain to do.