Refactoring is an art. You shan't forget anything whilst rewriting your program.
Lock to Q1 works again. Fixes #50