Safely wrapped everything in a closure

For security reasons.  Paranoia even.