Added message object and a bunch of config stuff