music2; midway through humongous refactor