Added Cluster Flow. A few design tweaks..