Completed assignment 2

Completed v1