WIP - more work on templates repository/service