Complete first draft of assignment 2