Followed chapter 2 of the tutorial

Everythign *seems* to be in order...