Finished up all of first draft