WIP: Progress on clustering