(in the middle of) re-factoring due to the BioPAX plugin changes...