Add with statement

So... this was stupidly easy.  For the life of me I can't figure out why this was so difficult last time I tried to do this.  /shrug.  Perhaps it was some part of the massive amount of code I deleted.
ugleee