added id's and new api
more changes
resolved merge conflict with master
minor change to tweak template data
working out data source for template