Completion of Dev-Sprint1