Moving Nitin's code out of BSD2, as it's unrelated