Feature/junjun add qc

This is a pull request to close out development of 2.2