Assignment 2 almost finished