checking in on core.c, looks good