Work on Base Commands, fixed thingies