Initial checkin of Ximmer code