Slot based message deliverey model M1

This is fixed in a later commit