Feature/363-2 - clustering