Some polish is still required though but we should talk about it. I
need some feedback.