This should add stuff from here for the journal. I don't think there's conflicts with current, but this may be where they exist.