Major messaround with the internal events and payForCommand logic. Not done just yet though.