New audio files
Message rendering partly done
Resolve merge conflicts
Message rendering