Add assignment 1 & 3