#54 Make queue in data model