flushed out database adaptor more, worked on structure