2014/06/18
A lot of changes.
14/06/19

Ready for 800K point, 10K cluster test.