Laying a foundation for equipment
Fixin some conflicts