Feature/message

Please feel free to criticize as much as you want.

And I know the commits are not nice I'm sorry @bunelr