Prep for command handling