Added proper orbital calculation. As yet untested.