More work done on the streaming app