Partial commit of second draft with delete functionality..
Merge remote-tracking branch 'shreymehrotra/master'