Add H.k, H.q

Some bare bones in H.q
Unit-test placeholder