Completed modules 10, 11, 12, 13
fixing merge conflicts?