This needs sorting...
Merge pull request #1 from Archmagejay/Core

This needs sorting...