Finish reworking (for now) [ci skip]