Merge Lab5 material, expanded objectives