WIP - splitting templates