Adds Rodericks changes from feature/LTI_Templates up till commit 904aadd