avoiding cross domain issues, slides working, need to fix book and handouts
resolved merge conflicts