Complete recode

recoded everything from scratch