Better command handeling

Now works for everything