Todos update, non-exhaustive because I'm exhausted