Merged control and menu condition code

The code has been merged, but transference is not fully functioning. Some cleanup is still required.
I think it's better to encode it in the epub. Instead of changing the step type to transferAndGroup as we read them in, maybe we could just write transferAndGroup as the step type in the solutions to begin with? Or at least add some kind of tag to indicate transference should happen for specific steps.