12 q2

Merged q2 stuff into plan2040