Simon, please review

This is a PR review comment ~ Literal Man