More work on the QA branch

Work in progress