need to refactor faker bits