Added actor-class, continued shop-system