1c done. Needs testing on 1a