Merged control and menu condition code

The code has been merged, but transference is not fully functioning. Some cleanup is still required.
The previously added step is never deleted. Its step type is just modified if transference is required.