Refactor to fix say.  Need to implement tests