Entity is nearly finished
Merge pull request #20 from AzureusNation/master

Entity is nearly finished