Re-enabling code to test functionality.
Continuing work toward restructing the code to handle the new command structure. Also did a round of ReSharper reformatting.