We can't have two command classes, tacky method of fixing that.