revamped archetypes
Merge pull request #49 from rciovati/master

Revamped archetypes