Feature/stv

This can be removed