1st commit before refactor for db