Start to correct the Broker application in hope that someone can pick this up from here