Initial commit, includes vaibhav' work too