Hacky changes to make it work with latest JabbR

It works! It's hacky right now, but it works.