Changed names, and started message creation func