Initial commit of Hussain's branch