Begin satellite refactor