added a placeholder for entities

lots of small commits. but i'm applying the template to the tutorial,
and figuring out in the same time what I should improve/modify :)