still testin macro atom parallel
fixed problem, now need to test parallelisation
initial testing of parallelisation complete, ready to merge to dev