- add Conor's editing code
 - broken complicated cropping
tidying