various changes to command model
new model code partially integrated into system, client still has errors