Functionalities Commit

All functionalities are working..