Build added. Also moves a bit smarter.
Build message class