Pivoted to using the cluster layout

seems to work pretty well in theory, but would need to do some serious
data finagling.