Updated to Etyllica 3.5
Separating models and views