Fixtures with attributes

Don't merge (yet), just need code-review.