Rogerbraun feature/spv redesign