second commit

still fixing...