Overlord response to PR feedback

Solid use of regexes :+1: