WIP: Improved data filling in