Add XP Compatibility

Hopefully this is an acceptable commit.