Lots of physics changes

Still a lot of work is needed. But it's a start