Non-linear Cosmic Ray Propagation