Nat

rebased nat on develop and added my commits