second commit

big changes