Major infrastructure overhaul + die roller fixed