Slot based message deliverey model M1

This is already corrected in a later commit