Total redesign, add Fenon as templater