major changes
almost done
almost done2