Add more commands, clean up Mock