simplify for now. Haven't gotten the undefined return to go away.