Adding crnsongs and working on related bits.
Skipping a long-running test