gui done
merge commit"