Moving in some stuff from songbook-core

https://github.com/patacrep/songbook-core/issues/11