Added messages & finished 1st beta

TODO
Fix the message error