Added more to entity and added Character
For some reason it split up my last commit