Started consolidation of common command handler code into abstract class