Tested pointer changes in naive.c and moved some declarations around.