data access
ranges adjust properly
Merge branch 'fit-restructure'