In this paper, we extend existing theory on non-linear unknown input observer design to a wider class of non-linear systems where the systems are subject to unknown input and output disturbances and experience faults. The approach used is to decouple the faults and unknown disturbances from the rest of the system through a series of transformations on state and output equations. Once total disturbance decoupling is achieved, an appropriate observer for the disturbance free part of the non-linear system is proposed and designed. The designed observer is, subsequently, used for estimation of unknown inputs, outputs, and fault signals. Two examples are given for illustration.