Some of the merges during rebase messed up the code and so I went back and fixed it.