More work on cage system. Player script needs merge.