Looks really nice, I like it

FYI: cluster swap is not only some simple swapping and coding. At least if milages differ between the old and new one.