Moved orbit calculation to orbit class