Mostly done, need to begin discrepancy checks/backwards compatibility