WIP in order to get transmitting working again