remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing