Work in progress - step 3

This commit should be squashed. It's here only to push on Github.