Fixed problems with odb; Completed data layer for now