All forward declarations eliminated. Switched to pointers. Time to find segfault...