commit #5

all done (i think)