Rewrote taking Matt's Q into account. Added tests that cover that scenario.