Add toggle, move command to server instead of API