Added ToDo Message + merging into my stuff