Fixed up command handler

Another Crack at #4