Added init stuff for assignment 1