Final commit (for now) - still segfault :(