Merged control and menu condition code

The code has been merged, but transference is not fully functioning. Some cleanup is still required.
More importantly where are we deleting the previously added step? Or should we be modifying it instead and therefore not allocating a new one?