Again this bit was mostly left untouched from @mynameisfiber so any feedback from him would be welcome.

Off the top of my head I think it should but I'm not completely certain of that.  I'll try to work through it a bit more and update.