Finished Orbit Equations
Merging Issues