Cancel message

DO NOT MERGE YET
So here is fine I guess :smile: