Manually merge in comment to lead code from simonwheatley

Note to self: do automated pull requests before you refactor code ;-)

Signed-off-by: Nick Ciske <nick@thoughtrefinery.com>