initial commit from course builder 1.5.1