massive update to orbit to support better scoping