Better command handling?