Gallery WIP, datasource refactor again