Categories rework pt. I