Now builds and doesn't segfault