Put in some geometry files and tried to fix the segfault.