Made a change
Finished the new function
Merge branch 'testing'

Add new functions