Can/should this have unit tests?