Merged control and menu condition code

The code has been merged, but transference is not fully functioning. Some cleanup is still required.
Should we be still concerned about this?