Made modifications, but currently in segfaulting state.