updated 5:12pm

still untested. errors.