WIP: adding (broken) clustering stuff