added ability to use location in commands