Bringing everything up to the end of the talk.
[master]: Adds some thready safety to the datasource items.

Otherwise the app can crash if messages are received "simoultaneously"