Product matrix closes #4