removed a lot of data access stuf
more data refactoring, about to start patient model