Merged control and menu condition code

The code has been merged, but transference is not fully functioning. Some cleanup is still required.
Are we going to use this function, if not can we remove this?