Changed to new command interface; cleansed ServerHooks to simplify for new command structure