Yeah, I don't know what f'd up here.  I'll have to fix it, but right now I can't get the tests passing anyways.  Havn't had time to work on this.