everything except delete done

basics almost done