Module tiers
Module tiers working. Combat fixes