BROKEN! Stubs for deletion and populating sample messages added.