Pull request - model and rendered slides

merge branches so we can assemble slides