Temporary solution for staves

Calling @wodkashorty to help!