First commit - 50% progress in the tutorial