Initial FFOS commit from recaf