Refactoring
End of skirmish
Refactor id to classes