Initial commit. Up to exercise 2.3