Changed how the batons work, now they require less managment when new properties are added.