Starting to make commands more safe!