Converting XP -> XPRaw

Also I broke saving forever.