But I wanted to make this first step without dropping ordering to get feedback, and mean I could do the refactoring without breaking any tests