SSP-2858. WIP. Still won't compile