Working on radix
Fixed merge error, maybe, not sure