in progress
customizations works
Merge branch 'master' into varun
delete kind of done
almost delete
merge