Added logs and found bug that was duplicating messages, testing..