WIP adding in Favea template