4th commit, basicly finished
forth commit, basicly accomplished..