finishing up assignment 1