Finished part 1 of proj2

WOOOO