1381fb6dfc
* Revert linter suggestion * Re-add nolint * Work in terms of pointer rather than copy * Add tests covering validation * Add comment