Lots of changes, unfortunately... seg faults.