Re-factoring clustering work and expanding client implementations.