Debugging Add Method
Resolved confilcts
finalized merge