Merged control and menu condition code

The code has been merged, but transference is not fully functioning. Some cleanup is still required.
I believe it was being used at one point, but if it's no longer necessary, then we should remove.