Part 2 of lab 2 done(-ish)