Commit 2 - done

finished