initial checkin of the confluence mods