Merge branch 'luke-data-integration-in-template'

work done makes the events template work correctly.