WIP: more holiday work

not tested