master commit

images and js we have so far