Merged control and menu condition code

The code has been merged, but transference is not fully functioning. Some cleanup is still required.
My opinion on block comments: They're more appropriate for class level or function level comments but for inline comments I prefer line comments (though you can split up one comment onto multiple line comments). The reason being is that if you're debugging and commenting out portions of your code with block comments, having actual comments with block comments inside that will not work as intended, whereas line comments will nest with block comments just fine and have the desired effect.