Refactored. Working, but Handles needs to be decoupled from OuterSpace module