Bjc integration -- Don't pull yet!

We really shouldn't lose these. Just, we should refactor the location and such.