This was assignment 2