Finished basic exercise and bonus 1