hmm, I dont' want this logic duplicated everywhere.  What can we do in the API to help avoid this?