Complete method definition.  Add a few test conditions