Adds Fee class
Adds fee functionality
Merge origin/master
Adds fee functionality