working on organizing data access stuff