Commiting With task #83 , #92 , #93
Commiting after resolving issue #83 #93 #82