Trying a different approach with q3
Added a couple more test files