Added proper command classes, need to get configs fixed