q1 not working yet, but progress made!