0.9a-p2

I think it all works ;) circles need inverting and then testing can
begin fully.