QA1 stuff

Interested in the shocks only if you want to split up