add mechanics class and containers