Better physics model
Still buggy, but goes in right direction.