with mockup for rearranging and regrouping (still in progress - need this commit to get project to my laptop)