Revamp the alpha to use the Thor CLI framework