WIP on the Database filler