major update

nearly done
commit