initial commit with new gemlock