Revert "Revert "Q7 finished""

This reverts commit 520ff46e6754b42a8acd60d9d7ec302c7183680b.