Up to michigan

still editing the rest