Mostly done with dbs1