Reworked how machines are handled and loaded. Allows for more flexability.