Refactor physics a bit.  Still needs some big changes.