SSP-2833. WIP. Hopefully final