Start of my new feature
Add in more functions.
Merge branch 'test'