Added classes and combat system