Revert "Revert "Cleaned up Orbital""

This reverts commit 41e266d5ebd8248e0fcdeb6180def788c85bd546.