Mostly done, with 'and' substitution for zeros