Adding template/hook TODO items. See: #41