Everything done in Conor.v except for one admit