Mostly finished TOS changes