Added rearrange

Signed-off-by: Andrew Miller <amiller@dappervision.com>
Merge branch 'conversion' of github.com:amiller/quartet into conversion