Latest code committed

Some changes in the code has been implemented.
Some design changes has been implemented
Some functionalities has been implemented.