finishing up assignment 2