partial commit, need to compare this to prev working build, everything segfaults