936680

don't merge, just parking for discussion, needs cleaning, tests etc