Orbit added. Seems to work but code feels messy