Added a bunch of stuff for HW4