Updating some stuff.
Merge https://github.com/theclockknowsall/xaos