Started adding annotations to hopefully remove the need for clientimpls in most cases. Next will be integration with the state machine handler