#47

Functionality implemented.
Also:
Used generic-messages wherever possible.