Intermediate step to making the whole thing simpler