working on rearrange, rendering state OK