Still segfaults but we're getting closer