Mqtt dev

Shall we check this TODO then and there and see if we need this? and clear it out! :)