Added avinash's changes. Added backup option to make. Going to start with David's changes