First iteration of modified cluster algorithm working
Some changes to clustering