refactor to use return states
make wait_cmd_resp wait longer for response to start and error out if expires