Command matching seems to work now