Merging the new Orbit system into the main branch

Should smoothly merge!