merged whole thing

all things together,working