Merge Problems removed
User Name added
Leaves functionality added (buggy)