Feature/erb templates