Total recategorization. SBBJ-R on backburner.

Not everything is functional. It's still being re-pieced.