Work in progress
Adding kafka
Work in progress