In the middle of a big refactor mess