initial commit
almost done
added all
fixed merge