Changed SurroundWith to use <div>
Enforced use of safe command execution