Assignment 1+2 Finally works! (Yay?)