Finishing of functionality

I have finished the functionality. Personal