Any reason why CBlock doesn't move to core.h? Or just a "first the easy parts"?