Attributes taken into account...wip
Merge branch 'start-attributes'