More work on access points, now added to CPF form