And now weird segfaults again. Seems fixable

Off to bed now, will resume later.