Missing a sum
Factor out the log p and log q expectations
hzx working right