Final version being tested with Martins code. Got messages going through finally