Added some new holders (possibly unnecessarily?); put sample data in templates