Third commit

Many changes!