WIP-simplify templates