PIM-2900: Add comments and spec