Actual Debugging

So something went wrong last night and github didn't sync the
SatelliteCode file that has all of the changes, so here it is.