Initial function for exercise 21. Testing branching and merging also.
Merge branches 'experiment' and 'master'