merged physics features from uranus-repo, basic physics work now