Decided that finishing this data source pattern is not needed right now