Add geiser (closes #1040)