Started reworking the entities to be more complex
Merge branch 'master' of https://github.com/wemakestuff/Teracast