Added todos
Switched ID subvariable from CombatEntity to EntityModel