OK, I'll continue mapping tommorrow. I think I may recode it for vanilla.