Removed hackish solution/ new cage system somewhat implemented