Might not build. Commit before major arch changes around qstatements