CLN: Get closer to unifying everything