Okay.  We should probably also change how locker does things too (I stole this code from there).