Oops, forgot to get Cvar to use new mapping. (not finished).