5th commit

almost done