Whole bunch of changes for bringing crc stuff in