Music lib support3

Iteration 3 of #26.