Merged control and menu condition code

The code has been merged, but transference is not fully functioning. Some cleanup is still required.
Same comment as in Connection.m. Is it worthwhile to come up with a better hash function?