Updated (is now compilable), but has segmentation fault.