WIP, esawyer data model changes.