Worked on backend stuff..
Merge branch 'master' of https://github.com/OxideDevelopment/CrossOver