starting to move over to using case class wrappers for results