#47 | #110

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