Add better controls for payment and state.